From bc172128dc614d6cbf3f1d6be8c29191ae5c6a3f Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Sun, 27 Feb 2005 17:49:45 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.37 (42220839uiUo4mhX0fedaXFvOocS4Q) Update error message when loading a "not Xen v3.0" image. Signed-off-by: chris@xensource.com --- BitKeeper/etc/logging_ok | 1 + tools/libxc/xc_linux_build.c | 2 +- xen/common/elf.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 9b3a330841..d53dd4819f 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -15,6 +15,7 @@ br260@laudney.cl.cam.ac.uk bren@anvil.research bren@br260.wolfson.cam.ac.uk cl349@arcadians.cl.cam.ac.uk +cl349@firebug.cl.cam.ac.uk cl349@freefall.cl.cam.ac.uk cl349@labyrinth.cl.cam.ac.uk cwc22@centipede.cl.cam.ac.uk diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c index 8f7a979d75..6eab54c98e 100644 --- a/tools/libxc/xc_linux_build.c +++ b/tools/libxc/xc_linux_build.c @@ -540,7 +540,7 @@ static int parseelfimage(char *elfbase, if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) ) { - ERROR("Will only load images built for Xen v2.0"); + ERROR("Will only load images built for Xen v3.0"); ERROR("Actually saw: '%s'", guestinfo); return -EINVAL; } diff --git a/xen/common/elf.c b/xen/common/elf.c index 38cbb30db0..3beb7b54c9 100644 --- a/xen/common/elf.c +++ b/xen/common/elf.c @@ -78,7 +78,7 @@ int parseelfimage(char *elfbase, if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) ) { - printk("ERROR: Xen will only load images built for Xen v2.0\n"); + printk("ERROR: Xen will only load images built for Xen v3.0\n"); return -EINVAL; } -- 2.30.2